(make-help-screen): Don't call window-frame in a non-multi-frame Emacs.

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 83e7b09b35c1433f178b37d3232948f64a01f908..55f63f25c5edf7cab2227579a06a978941c1dd0b 100644 (file)
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -114,10 +114,11 @@ and then returns."
                         (progn
                           (setq config (current-window-configuration))
                           (switch-to-buffer-other-window "*Help*")
-                          (if (not (eq (window-frame (selected-window))
-                                       prev-frame))
-                              (setq new-frame (window-frame (selected-window))
-                                    config nil))
+                          (and (fboundp 'make-frame)
+                               (not (eq (window-frame (selected-window))
+                                        prev-frame))
+                               (setq new-frame (window-frame (selected-window))
+                                     config nil))
                           (erase-buffer)
                           (insert help-screen)
                           (goto-char (point-min))